From: Daniel Colascione <dancol@dancol.org>
Date: Mon, 10 Dec 2012 20:55:02 +0000 (-0800)
Subject: Merge from private trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~1388
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5b55e0b70f89dee84f6550e66267358a0a96d6b8;p=emacs.git

Merge from private trunk

Daniel Colascione 2012-12-10 Add emacs.res to .bzrignore
Daniel Colascione 2012-12-10 Fix cygw32 build break
---

5b55e0b70f89dee84f6550e66267358a0a96d6b8
diff --cc ChangeLog
index a351872f545,33a5802ce47..2bb7eab468e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,7 +1,13 @@@
 +2012-12-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* configure.ac (HAVE_INOTIFY): Speed up configure-time test.
 +	There's no need to test for any of three inotify functions,
 +	since we use all three.  Check for just the first one.
 +
  2012-12-10  Daniel Colascione  <dancol@dancol.org>
  
+ 	* .bzrignore: add src/emacs.res.
+ 
  	* configure.ac (W32_RES, W32_RES_LINK, WINDRES): Teach the cygw32
  	build how to compile Windows resource files; use these variables
  	to tell src/Makefile.in how and whether to compile resources.